Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addictions 2 electric boogaloo #1897

Merged

Conversation

MilonPL
Copy link
Contributor

@MilonPL MilonPL commented Sep 23, 2024

About the PR

fixes the stupid addictions (forever??)
doesn't actually modify reagents yet, I'll just PR this to CD and pull the changes from there instead of commenting everything

Why / Balance

outdated and not really balanced for MRP
fun fact: I originally learned C# just to fix this one thing

Technical details

uses StatusEffects, the code should be pretty well documented
the SharedAddictionSystem is responsible for adding the status effects, AddictionSystem does all of the updates on the component, the component stores the TimeSpan of last addictive substance metabolism cycle, i spent 3 days figuring out how to solve the issue of suppressing pop-ups

Requirements

Breaking changes

Changelog

no fun yet since it's just the system

@MilonPL MilonPL requested review from a team as code owners September 23, 2024 11:39
@github-actions github-actions bot added Status: Needs Review Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files and removed Status: Needs Review labels Sep 23, 2024
@deltanedas
Copy link
Member

rest in piss doping burgers with addictine

@TadJohnson00
Copy link
Contributor

Long story short for everyone who didn't understand "fixes the stupid addictions forever".

Addictions will no longer use the system they did before, wherein they would add a reagent (addictine) to your bloodstream which would make you act up and tweak a bunch even in minor quantities (you eat one dank pizza slice and suddenly you crave weed all day every day). Now it's more similar to alcohol and hallucinogens of old, where it applies a status effect. It makes more sense now.

Obv. dir. approv

Copy link
Member

@deltanedas deltanedas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also needs a client system

Content.Shared/DeltaV/Addictions/SharedAddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/EntityEffects/Effects/Addicted.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
@MilonPL
Copy link
Contributor Author

MilonPL commented Sep 24, 2024

also needs a client system

i stashed it and never committed it after merging master :blunt:

@MilonPL
Copy link
Contributor Author

MilonPL commented Oct 5, 2024

@deltanedas it's been 2 weeks re-review pretty please

Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Shared/DeltaV/Addictions/SharedAddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Server/DeltaV/Addictions/AddictionSystem.cs Outdated Show resolved Hide resolved
Content.Shared/DeltaV/Addictions/AddictedComponent.cs Outdated Show resolved Hide resolved
@deltanedas deltanedas added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review labels Nov 3, 2024
@MilonPL
Copy link
Contributor Author

MilonPL commented Nov 3, 2024

ok I'll be real i had no idea what I was doing back then

Resources/Prototypes/Reagents/medicine.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Reagents/medicine.yml Outdated Show resolved Hide resolved
@MilonPL MilonPL force-pushed the addictions-2-electric-boogaloo branch from 681a83e to 5bbdb9c Compare November 3, 2024 16:34
@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Do not merge due to requested changes labels Nov 4, 2024
@deltanedas deltanedas enabled auto-merge (squash) November 4, 2024 14:42
@deltanedas deltanedas merged commit 7f53bd3 into DeltaV-Station:master Nov 4, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants